Merge "Separate auto click preference controller from accessibility"