automerge: e8f6bd48 * commit 'e8f6bd48': docs: Added info on noHistory and onActivityResult(). Bug: 13807256