Merge "harmony: disable phone intent, override default ADW columns/rows." into froyo