Merge "Add module selector in theme editor" into studio-1.4-dev