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

Change-Id: I986dc0c5bda928e4ff42ff218a056249db6ba89e