Merge "Make skip bar more user friendly" into stable-2.8