Merge "Remove preferKeepClearAreaForFocusDelay, turn it into a flag"