Merge "Fix stretched nav bar menu icon" into oc-dev am: b7980a3bbe
am: 4a2a9a3c43

Change-Id: I51d3c5ef4e378574bb6d81ac50724ffa38ed2ecc