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

Change-Id: I54ea4366ec71f58d23869fb798532aa10c588754