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

Change-Id: I50588e17f07d89daa3a989a72080a4fe695b4729