Merge "Respect add focusables flags" into nyc-dev