Merge "Fix MenuViewLayerTest on AAOS" into main