Merge "allow Uri as intent extra in am command"