Merge "Add Overlay compose into Underlay directory. The design of underlay is...

Merge "Add Overlay compose into Underlay directory. The design of underlay is obselete. The Underlay folder will be renamed as Overlay in the future." into main