Merge "Disable the photo preloader, to not confuse the asserts"