Merge "Avoid NullPointerException when activity is automatically recreated"
am: ea5113094b

Change-Id: I3313ad358ce128b29c19840730577dce2c962727