Merge "Cleanup release wakelock on bg thread flag" into main