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

Change-Id: I44ee0fbfba483a87f461bfc0099e1b8242f904a7