Merge "[KTF integration] Fix AodAlphaViewModel" into main