Merge "Update theme and module selector with mockups" into studio-1.4-dev automerge: f0ac8f2
automerge: 814f53e

* commit '814f53ea4b4a3a963f7b38e025a7cae47b200c7c':
  Update theme and module selector with mockups