Merge "Fix BottomSheetBehaviorTest on Gingerbread" into mnc-ub-dev