Merge "Default silent notifs on lockscreen to on" into qt-dev
am: a501bbc75c

Change-Id: I2577a14508d62c4899b9a58b0c86e5be4eafaf07