Merge "Removes non-public themes from theme selection dialog" into studio-1.3-dev