Merge "freeze screen rotation during memory and app launch test" into lmp-dev