Merge "Notificiations Design for Android L Release" into lmp-dev