Merge "Set number of columns of photo picker dynamically" into nyc-dev