Merge "WindowInfo: Cleanup reading from parcel" into tm-dev