Merge "Make Back arrow stroke appear earlier" into udc-dev