Merge "Fixes and changes to support settings using UsageView" into nyc-dev