Merge "Don't worry about mWmInternal being null" into main