Merge "Don't allow non-showOnLock activity to be next on finish." into pi-dev