Merge "[Bugfix] avoid deadlock caused by android.bg and RollbackManagerServiceHandler" into main