Merge "Fix redlines and strings in Controls dialog" into rvc-dev am: e34b1324 am: 2049c6b5 am: 25cc14ea Change-Id: Ib21e3492e6d59592e18b740d2c4495c58754c0ea