Merge "Revert "Fix work challenge lockscreen being dismissed"" into rvc-dev