Merge "Fix floating sheet overlap with 3 button navigation bar" into main