Merge "fix media query correctly" into tizen