Merge "[Fold to AOD] Play fold to AOD even if we already in AOD on the inner screen" into tm-dev