Merge "Fix for N_SE-46376 and N_SE-46424/Firing CancelButton events on Enter" into...