Merge "Notification: Apply small icon level" into nyc-mr1-dev