Merge "Add orientation configuration for touchscreen devices"