Merge "Fix "square corners" appearance of new Back Arrow" into tm-qpr-dev