Merge "Cache isIgnoreActivitySizeRestrictions" into main