Merge "Update user capabilities in onResume." into nyc-dev