Bug 1028489 - [ringtones] Cancelling out of creating a ringtone (from the manager) doesn't clear events properly
Bug 1022429 - [Homescreen] Flatter design for notification tray.
Merge pull request #20839 from jimporter/ringtones-create-cancel

Bug 1028489 - [ringtones] Cancelling out of creating a ringtone (from the ma...
Merge pull request #20812 from anefzaoui/bug-1022429

Bug 1022429 - [Homescreen] Flatter design for notification tray.