Merge "Missing thumbnails should throw." into qt-dev
am: b26d003713

Change-Id: Ia3fa8f5ffc0953d3e981fa2663b892e55aafa0c5