Merge "Fix redlines and strings in Controls dialog" into rvc-dev am: e34b132442 am: 2049c6b5c1 am: 25cc14ea65

Change-Id: Ib21e3492e6d59592e18b740d2c4495c58754c0ea