Merge "Remove unnecessary null check code for RemoteView"