Merge "Improvements on "App data usage" screen." into nyc-dev