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

Change-Id: I013d9a91e9ade0ca0d5e311cd285628a44b3ec11