Merge "Controls UI - Add PIN dialog" into rvc-dev am: 3f164ee5a7 am: 020725c66e am: 675d9c3216 am: 0281bb3c31

Change-Id: I03df51ebf9096e5e6dc5f442727ecf124a9c795e