Merge "[flexiglass] Improvements to lockout state management and rendering:" into main