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

Change-Id: Iba67789fa694e0978370dbd0ad60c14bb8222be6