Merge "Extend settings panel under navigation bar" into tm-qpr-dev