Merge "Clock padding and motion adjustments" into pi-dev