Merge "Fix unresponsive touch screen after NFC WPS dialog is closed" am: 668046af am: 5d089688 am: 06c2d59c am: db63bbc5 Change-Id: I8c7f44447aa589ac268e6a8ce084cc2d27924a5f