Merge "Refactor background/system user behavior"