Merge "Create aconfig flag for optimized linear layout" into main