Merge "Fix a crash in RemoteViews." into lmp-dev