Merge "Force keeping BottomSheetBehavior to STATE_EXPANDED" into udc-dev