Merge "Split PipShelfHeightTest to check both movement up and down"