Merge "Potential fix for accidental deactivation of profile owner" into lmp-mr1-dev