Merge "Cleanup the content overlay" into 24D1-dev