Merge "Fix broken gesture nav edu on tablets in portrait." into udc-qpr-dev