Merge "Preserve focus after layout" into nyc-dev