Merge branch 'sony-laptop' into release