Merge "Use UID when hiding/unhiding notifications"