Merge "Revert "Block intents with action set as null""