Merge "Fix for null pointer when launching Connected devices."