Merge "Added DISALLOW_RUN_IN_BACKGROUND user restriction"