Merge "Keep track of who has disabled applications." into jb-mr2-dev