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

Change-Id: I4964552a38a8e6a07329caa0d1ef9c436f3673b2