Merge "OMS: Update PM on main thread with lock" into sc-dev