Merge "Fix wrongly laid out navigation color view" into mnc-dr-dev