Merge "Avoid app idle check on boot." into main