Merge "Remove Snapshot and Splash Screen from consecutive entry check" into sc-dev