Merge "Correct activity lifecycle when forcedResize activity is finished" into nyc-dev