Merge "Silent notifs appear on lockscreen by default" into qt-dev
am: f58cd0fb51

Change-Id: I39f53bcf9665291fb3961e7358aec09e60a310e7