Merge "Use .setImageURI when updating the photo Uri" into qt-dev
am: cd8de46190

Change-Id: Ifb7b0b9b0a0456100a99da2c08d055a1aae9ac84