Merge "Refreshing state in QS with upcoming state of KEYGUARD"