Merge "Fixing bug 2455152 - Enabled accessibility services are disabled upon restarting accessibility"