Merge "Remove black flash when unlocking work profile" into rvc-dev