Merge "Prevent restricted user from adding network through camera" into tm-dev