Merge changes I179b9b3a,I705648c9

* changes:
  Controls UI - Theme + color alignment
  Controls UI - Support thumbnail template