Merge "PointerLocationView: Make header avoid rounded corners"