Merge "Gallery2: Fix use of uninitialized stack variables" into nyc-dev