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