Merge "Activity.onStop(Bundle) does not exist" into jb-mr1-dev