Merge "Fixing bug 2451615 - Accessibility services are started upon system reboot while accessibility is disabled"