Merge "replaced deprecated getIntent with parseURI"