Merge "Fix tap on navbar handle when on desktop" into udc-qpr-dev