Merge "Revert "Let activities can be recreated in ON_START state""