Merge "DO NOT MERGE Support WiMAX Settings & ticker message" into gingerbread