Merge "Apply scrim protection to atomic state transition ALLAPPS -> NORMAL" into sc-v2-dev