Merge "Input data must be kept while activity is recreated"
am: 551134bbcd

Change-Id: I0c16dde173eb6c0ae5b71d269a66ac27c673041d