Merge commit '7e509fd267d25fbfe2703d0320a5203f24046b61' * commit '7e509fd267d25fbfe2703d0320a5203f24046b61': Fix high density bug 2179543: use 'dip' instead of 'px'
Merge commit '7e509fd267d25fbfe2703d0320a5203f24046b61' * commit '7e509fd267d25fbfe2703d0320a5203f24046b61': Fix high density bug 2179543: use 'dip' instead of 'px'