Merge "Make SGLM view snap test less flaks" into lmp-mr1-ub-dev