Merge "Fix shotcut option list horizontal space" into main