Merge "Activity interceptor dialog for suspended apps" into pi-dev