Merge "Fix mismatching intent filter string in AndroidManifest.xml"