Merge "Prevent using invalid result uri during multi user image change" into pi-dev