Merge "RemoteViews: don't crash on null display in getLaunchOptions" into tm-dev