Merge "Set initial meta state to AMETA_NONE" into tm-dev