Merge "Fix button on Gingerbread when using Toolbar" into mnc-dev