Merge "Set TvPipController's state only when PiP finished appearing" into tm-dev