Merge "Change back button to cross for create flow" into main