Merge "Alter two uses of hasOrMadeRecentMasterChanges() for consistency"