Merge "68091: NPE in DeviceMenuAction.createPopupActionGroup" into idea133