Merge "Fix nav bar leak in SystemUI" into qt-qpr1-dev