Merge "Save BottomSheet state when screen rotate"