Merge "Expose getPreferKeepClearForFocusDelay as TestApi" into tm-dev