Merge "Disable unused display area features" into main