Merge "Add workaround for measuring stacked button bar layout" into mnc-dev