Merge "Skip to wait app killed mechanism if no active uid" into main