Merge "Merging ongoing + latest notifications on phone UI to match tablets."