Merge "Fix ToggleSubscriptionDialogActivity dialog theme." into sc-dev