Merge "Revert new logic around FLAG_ALT_FOCUSABLE_IM" into rvc-dev