Merge remote-tracking branch 'origin/dev/ldewangan/integrate-common-overlay' into merge-integrate-dev-main Change-Id: Ia040e750627927c6fd95fae9f925cffc3bf79a56