Merge "DO NOT MERGE: Don't let previous activity wait if next activity won't be visible" into pi-dev
am: 2eec1279c6

Change-Id: I8403fd309da5f0390b02dc0999606ca0c78b6638