Merge "Remove WM lock from the path of service operations" into sc-dev