Merge "Set up correct ComponentName for test mode of Parental Controls" into tm-dev