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

* commit 'c449613ec6ffed7b4605a6708a3341ab2dd5320f':
  Revert behavior to perform onResume.