Clea Up for unnecessary overlay for SG Note
Merge remote-tracking branch 'upstream/jb-4.2' into jb-4.2