Merge "Merge "Remove preferKeepClearAreaForFocusDelay, turn it into a flag" into tm-dev am: 12a7628e am: 47c0bc92 am: 5920870d" into tm-qpr-dev-plus-aosp