Merge "Tweaks to drawer layout." into mnc-ub-dev