Merge "Bug 5045498 Force display update when display registers"