Merge "Fix a NPE when displaying device detail page."