Merge "Revert NFC adapter user context change." into main