Droid namespace shuffle: Finishing off Modality, OpenableControlViewModel.