Merge "Update skip button label to "Do it later"" into oc-dr1-dev