Merge "[flexiglass] Fixes back navigation." into udc-qpr-dev