Merge "Fix cancel button behavior when setting data limit."