Merge "Keep lockscreen open when all notifications are gone" into master-lockscreen-dev