Merge "Fix overlay view not updated during scaling TvView" into oc-dev