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