Merge branches 'sony-laptop', 'bugzilla-14247' and 'bugzilla-14271' into release