Merge "Revert "Fixed default angle to be Orientation.LEFT_RIGHT""