Merge "Remove concept of backdrop" into main