Merge "afm-user-daemon: Remove it by default"