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

Change-Id: Ia38137f24d72f8052cff6a650f4f3e302abc3d14