Merge "Align taskbar so that it does not overlap with nav buttons." into tm-qpr-dev