Merge "Fix persisted job handling in bad-boot-RTC situations" into pi-dev