Merge "Prevent assign layer on DisplayArea while in a transition" into main