Merge "Prevent wakelock from being held when sync services finish"