Merge "TIAF: fix TvIAppView and TIAMS bugs"