Merge "Allow switching to outer screen only after passing 90 degrees" into 24D1-dev