Merge "Animate Back arrow pop off edge consistently" into udc-dev