Merge "Don't accidentally scroll QC off screen." into lmp-mr1-dev