Merge "Merge "Catch NPE and add more logging for a crash in Tile" into qt-dev am: 781ebfb0" into qt-dev-plus-aosp