Cherry-pick Galery HIDPI: 767f8e1a41badd8906d0ef490e8e2302403e9a2a
Cherry-pick Music HIDPI: 72addc6429e44190e8bf1ffc9c8ad495ca6c492a