Merge "Consolidate notification layouts by removing xlarge versions."