Merge "Replace PowerHint with Boost in SurfaceComposer callback"