Merge "Revert "Fixed an issue where the user would have no notifications on lockscreen"" into sc-dev