Merge "Fix crash onDestroy if user restriction is enabled."