Merge "NavigationView allows manual tints of icons"