Merge "Controls UI - Various header fixes" into rvc-dev am: c2b97944 am: aa69895d am: 1934f3f2 Change-Id: Ia472c05fd6aa83fe0919e00607da59ed03feff1b