Merge "Disallow clicks on privacy chip before provisioned" into tm-dev