Merge "docs: Updated the retaining an object during conf change. Bug: 10303533" into klp-docs