Merge "Remove hidden API usage in WM Extensions impl" into sc-dev