Merge "heroc/Gallery3D: Remove DIRTY UGLY HACK from Gallery3D Overlay" into froyo