jf: Update overlay

 * Various updates to match stock configuration

Change-Id: I676205dc20b4c824022389f2465302425f2067a5
Merge "jf: Update overlay" into jb4.2