Merge "Reset the photo BEFORE we request a layout" into jb-ub-mail-ur8