Merge "Fix NPE in RemoteViews (issue 6408103)" into jb-dev