Merge "More TvPipMenuTests tests in WmShell"