Merge "Revert behavior to perform onResume." into klp-dev