Merge "Call `maybeHandlePendingLock` when GONE => AOD is finished" into main