Merge "Move PM cache invalidate inside mlock" into sc-dev