Merge "Merge "Fix a timing bug, make sure to wait for the assistant to enable" into pie-cts-dev am: a0886fa602"