Merge "Add app:headerLayout attribute to NavigationView" into lmp-mr1-ub-dev