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

Change-Id: I15263e86264b7cd167c67648ddea5cdce27913cf