Add proper support for density and keyboard state match. Change-Id: I410aba52ee0f0d9df31fa2abdc9485054595263f