Merge "Fix 3482911: NPE in CustomizePagedView.resetCheckedItem"