Merge "Don't always transfer device owner status to other users." into mnc-dev