Merge "Base: Predictive Back, add support for large screens when swiping" into udc-dev