Merge "Revert "Intercepting activites that could cause lock task mode violation in ActivityStartInterceptor.""