Merge "Fix ambient display time unit error" into pi-dev