Various overlay fix-ups for ApexQ
Merge pull request #1 from nardholio/cm-10.1

Various overlay fix-ups for ApexQ