Merge changes from topic "tiles" into p9.0

* changes:
  SystemUI: Make NFC QSTile great again
  Revert "QS: Fix NFC tile for Pee"