Merge "Set layout_width in WiFi+NFC resource" into lmp-dev