Merge "Correctly save Activity's state in saveInstanceState"