Merge "Fix focus issues on RV." into nyc-dev