Merge "Fix NFC UI is not available when switching to 2nd user" into rvc-dev am: c56bcb5e7f
am: a287641adf
am: 5c35333116
am: 36d89020d1
Change-Id: I1d46e4ee7d04ac29ffa9a15b9589f5d41f0cfb04
This commit is contained in: