Merge "CompatChanges for TileService#startActivityAndCollapse"