Merge "Revert "Add missing intent filter in AndroidManifest""