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

Change-Id: I99eded71beacd095ac82e9c96bb6c8cfb72a70f2