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

Change-Id: Iddd89c9ecf0e663bfc80b88df0ea7c92414138a1