Merge "Clean up QS/NSSL bottom margin calculation" into tm-qpr-dev