[automerger skipped] Merge "DO NOT MERGE: Don't let previous activity wait if...

[automerger skipped] Merge "DO NOT MERGE: Don't let previous activity wait if next activity won't be visible" into pi-dev am: 2eec1279
am: beb2c31a -s ours
am skip reason: subject contains skip directive

Change-Id: I1f5f4ef206902220e12c671e2b8c276b89a23d17