am 1686335a: am 26bc6907: Merge "Set layout_width in WiFi+NFC resource" into lmp-dev

* commit '1686335a7775f41e4c56f3ecdfed10fdc6ea2cc3':
  Set layout_width in WiFi+NFC resource