Merge "Keep QS header appearance and unlock icon in SHADE_LOCKED."