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

Change-Id: I0261abd0ca255520e4b062b4bf4729e5ee60a9cb