Merge "Remove unmatched mUserLeaving setting" into main