Merge "Fix ActionBarOverlayLayoutTest" into main