Merge "swapchain: Eliminate silly difference with AOSP" into tm-dev