Merge "Disable system toolbar feature" into tm-dev