Merge "Fix layout and invalidate in SubtitleView" into klp-dev