Merge "Fix NPE when trying to get input device for attributes." into qt-dev
am: 486194f79e

Change-Id: I8f1e98154d62978119638d14e241493222db5134