Merge "Controls UI - Add PIN dialog" into rvc-dev am: 3f164ee5a7 am: 020725c66e am: c2e5c9219d am: 699e585784

Change-Id: Ifa0811f4e7b62eefa19ed25b01ba1b554bdb5529