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

Change-Id: I00f8381c9ea1b42bb2365bad4fc16f250a8dd482