Merge cm-10.1 commits +  i9500 support