Merge "Fix duplicate display update upon nav mode change" into tm-qpr-dev