Merge "Two panel workspace TAPL follow up CL"