Merge "Update time in layout preview" into lmp-dev