Merge "Improve message posted when inactive changes are abandoned"