Merge "Add try/catch to prevent NPE in PagedTileLayout" into rvc-dev am: 1daf6ea6a3

Change-Id: I799709ebaa5c310acbf346bacc64c79cffa994c5