[TIMOB-16126] Update proxy indices on update
[TIMOB-16157] Ensure proxy observer is set before layout
Merge pull request #5199 from vishalduggal/timob-16126

[TIMOB-16126] Update proxy indices on update