Merge "Use collapse handle area height to calculate QSB margin on tablet" into tm-qpr-dev