Merge "Use config to display custom tapjacking component name." into pi-dev