Merge "Improve external storage docs on Context." into klp-dev