Merge "Longer wake lock timeout" into pi-dev