Merge "Controls UI - Add PIN dialog" into rvc-dev am: 3f164ee5a7 am: a45d5b8f74

Change-Id: Ib3973de54714aacd4b013f7e80d325b514e81aad