am 437bd674: am f71585f6: Merge "Use new device identifier to check if a layout has been set." into lmp-dev

* commit '437bd674a962fecb5d0cbf8bfe5f2c07c3aa527e':
  Use new device identifier to check if a layout has been set.