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

Change-Id: I2ea804afc4aa2eddc0630eb7f40b53274f6ff7b6