Merge "Fixing broken add focusables behavior I have introduced."