Merge "Prevent ViewRootImpl.mDisplay become null."