Merge "Calling the correct method when adding accessibility focusables." into jb-dev