Merge "Accessibility settings get into state not allowing to enable accessibility." into ics-factoryrom