Merge "Create flag for enabling layout tracing in SystemUI" into main