Merge "Enable InsetsState to store sources with discontinuous IDs"