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

Change-Id: Ie8f171bd158dab625e666b530189829f63da1c38