Merge "Remove accessibility category from developer options." into jb-mr1-dev