Merge "Fix system UI break in some devices"