Merge "Hides the Save UI while handling a pending intent from CustomDescription." into oc-mr1-dev