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

Change-Id: I60c3c40effba182b1a8f9bd2be373b98d11f9250