Merge "Fix the wrong tint state of Nav buttons" into pi-dev