Merge "Fix QS interception on tablets" into lmp-dev