Sync frontend changes from spree/spree 9bf7a7a..a2f78f1.