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

Change-Id: I66867dee69c7ffc0dae1ee8eb027c0f645d852bd