am 3c439c72: am 85fae34e: am 70ea8578: Merge "Fix wrongly laid out navigation color view" into mnc-dr-dev * commit '3c439c72': Fix wrongly laid out navigation color view