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