Merge "Modal bottom sheet matches screen width by default" into mnc-ub-dev