Merge "Clarify the intention of setNotificationsShown" into mnc-dev