Fix Carrier Label hide and fix redraw issue

Change-Id: I367711b039ea08e773a355129e91ca1f33295553