Merge "HWComposer: Unset mPrimaryHwcDisplayId after disconnectDisplay"