Merge changes up from wmusiphone branch