Merge "Separate long press timeout preference controller form accessibility"