Merge "Removing disk access from startActivity thread" into nyc-dev