Merge "Check calling user id against current user before setting navbar mode." into tm-qpr-dev