Merge "Fix for Settings timezone names when boot time is wrong"