Merge commit '52bce9c4e7b66ee0a8e1bc5ea7798cf5892b4f23' * commit '52bce9c4e7b66ee0a8e1bc5ea7798cf5892b4f23': Fixes #1949502. Prevents an NPE in View.buildDrawingCache().
Merge commit '52bce9c4e7b66ee0a8e1bc5ea7798cf5892b4f23' * commit '52bce9c4e7b66ee0a8e1bc5ea7798cf5892b4f23': Fixes #1949502. Prevents an NPE in View.buildDrawingCache().