Merge "BgDexopt: Reschedule job on timeout" into pi-dev