Merge "Add module selector in theme editor" into studio-1.4-dev automerge: b4b5e51
automerge: 556bd1c

* commit '556bd1c45f3f157a39cfa03ece02f2f234ef7ed2':
  Add module selector in theme editor