Revert "LPS-32831 Source formatting"

This reverts commit 51f35bed6852b7582e269bd2d96b2c95060e322b.
Revert "LPS-32831 optimizing logic for layout merging"

This reverts commit d2d43943a93ea21b5d4cb095b6208f72962d458a.