Merge "Merge "Merge "Fixed a bug where the notifications were not updated when switching users" into qt-dev am: 4a5ddd0a" into qt-dev-plus-aosp am: 3770a2fb"