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

Change-Id: I1a4b621dd5eb016a58062477ff764405c6948cde