Merge "Implement remaining infrastructure for user disabling apps."