Merge "[flexiglass] Fixes QS header never being set invisible when unlocked." into main