Merge "Fix NullPointerException for clear pending device present list" into main