Merge "Fix getting proper device rotation value based upon valid displayId of multiple display device." into pie-cts-dev