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

Change-Id: I10acab5ad1f3965d5bf633c84024fc70d76f7b0c