Merge "Set better defaults for layer stack and oriented display space" into tm-dev