Merge "Gallery2: Fix NaN comparisons" am: 6f8c54d224 am: 9ac972e9bc
am: 9e29df9dd4

Change-Id: I0db897b5532de596616002e0ca1be15cce684915