Merge "Reduce more power advisor churn" into tm-dev