Merge CM10.1 experimental changes into CM10.1 stable