Merge "Resetting shade state when unfolding on keyguard"