Merge "Fix BandMode Dialog Crash on Open due to Style" am: 7588ef1518 am: 7aacdc2c13
am: c015a1bac0

Change-Id: I5d1f931b9b5a6dae87d4effd20ec91d6f9114989