Fix Lockscreen Notification bugs on build