Merge "Trebuchet: Remove overlay" into cm-10.1