Merge "Change the time format to short" into pi-dev