Merge "Displays a user-friendly name for the theme parent name" into studio-1.3-dev automerge: 3ca6e85
automerge: a9e2c7c

* commit 'a9e2c7c9552a54cdf96e7c9d73a2013409fa1655':
  Displays a user-friendly name for the theme parent name