Bug 1074117 - Use expected conditions and optimise element lookups in gallery app object