Merge "Do not store bitmap into Bundle in onSaveInstanceState" into nyc-dev