Hmmm... have you ever tested it in landscape-mode-enabled apps?
device-width varies on landscape and portrait mode, so I think we need to consider both mode using device-aspect-ratio.