Merge "Override addFocusables to not include inactive children"