Merge "Fix issue #21799741: AbstractThreadedSyncAdapter crashes..." into mnc-dev