Merge "Controls UI - Fix title icon" into rvc-dev am: 5338509b9d am: dc2e86a7d0 am: a019f161f7

Change-Id: Ib833a7f6d333bc2a599037f8a5f0d986c944f984