Merge "Demo/prototype apps for time zone updates"