Merge "Fix crash if timezone is changed and "Don't keep activities" mode is on"