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

Change-Id: I898412cfc5ece47f24bcfb24a3a3976027042ddb