Merge "Remove a dependency on IMMS#getCurMethodLocked()" into main