Merge "Prevent NPE in ActivityStack#shouldbeVisible." into oc-dev
am: a087127e77

Change-Id: I3c8bfb7fb2961dfef71b7903f78d20ff21f0dc84