Merge "Fix displayId unsynced between app and system server."