Merge "Adjust the bottom sheet and save UI" into tm-dev