Merge "Remove unlock dialog from sysui" into rvc-dev