Merge "Not show hover border on select mode" into main