Merge "Fix issue #6319312: Consecutive call to Activity's onCreate()/onResume()..." into jb-dev