Merge "Input data must be kept while activity is recreated" into pi-dev