Merge "Document how to handle save on multi-steps activity." into oc-mr1-dev