Merge "Update creationFlag state only on non PSApp" into main