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

Change-Id: Iba30a32760531e4b0932efcd2054d11b1adb40c8