Merge "Ensure reordering of notifications is allowed when communal is showing." into main