Merge "Prevent systemui crash by adding view to an invalid display"