Merge "Controls UI - Fix multiple PIN dialog attempts" into rvc-dev