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

Change-Id: I3fc1aac796f2e99e90572fbe057f75ec39a8706d