Merge "Fix shade flicker & touch absorption" into sc-qpr1-dev