Merge commit 'ae7e8a760d7ce3ab1ec6f965cc0164e8be3eeba8' * commit 'ae7e8a760d7ce3ab1ec6f965cc0164e8be3eeba8': Fix a possible NPE in View.
Merge commit 'ae7e8a760d7ce3ab1ec6f965cc0164e8be3eeba8' * commit 'ae7e8a760d7ce3ab1ec6f965cc0164e8be3eeba8': Fix a possible NPE in View.