Merge "Settings crashing if there are no installed accessibility services." into jb-mr2-dev