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

Change-Id: I0dd365652f4deac7b69b181317b0dd86610400a7