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

Change-Id: If1e07992fb1cd8fd2e258b3435ee7506ad4c3291