Merge "Verify Bundle is not null before using it" into qt-dev