Merge "Remove the action bar icon when there is no drawer enabled." into mnc-dev