Merge changes I170b032e,Ia160560d into main

* changes:
  Set different affinity for display activity
  Run weston as a systemd user service