Merge "Controls UI - Fix title icon" into rvc-dev am: 5338509b9d am: 77b3c0e4e3 am: 41c90098b8

Change-Id: Iff7481f100a0bd9984171498f7ad52fa7ba4dfb2