Merge "Do not run hint animation during aod=>ls transition" into tm-dev