Merge "Use DisplayController.Info to determine if it's a tablet" into udc-qpr-dev