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

Change-Id: I388e862b70ae1ee7909e725bbfe4ce03fcc7669a