Merge "Adapt to the fix of ActionBarOverlayLayout" into main