Merge "DO NOT MERGE Fix work profile change race condition in LMS" into rvc-dev