Merge "Fix meminfo accounting for visible apps" into nyc-dev