Merge changes Ie7025815,I8545c938 into main

* changes:
  [res] Reduce allocations in OverlayManagerSettings
  [res] Minor optimizations in OverlayManagerService