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

Change-Id: I081c00f5e57adc883be2a1e8478cfa467d49166c