Merge "Hide empty text view when airplane mode" into rvc-dev am: 589c5c5571 am: 0965083495

Change-Id: I0edfa498a3f067ab05ea3d80c2343cda6d3e254c