Merge "Setting result earlier than onPause" into sc-dev