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

Change-Id: I3b590b33c95cadeba0d538bf42d53faf82dde48f