Merge "Unify keygaurd occluded status variable." into sc-v2-dev