Merge "Block overflow menu during setup."