Merge "Add try/catch to prevent NPE in PagedTileLayout" into rvc-dev