Merge "Fixing a NPE in accessibility manager service."