Merge "Using AppCloning building blocks flag instead of specific intent redirection flag."