Merge "Keep notifs visible on LOCKSCREEN->GONE with shade expanded" into main