Merge "Support B&R of notifications in non-system users"