Merge "Do not update enabled state when app ops is not changed" into tm-dev