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

Change-Id: I7f8b230e58e6dfdd8cf431bcf92d08149609396f