Merge "Provide a valid ComponentName for testing Parental Controls" into tm-dev