Dock function keys fix 2/2

(needs fb)

Change-Id: I537831fd8e69c8d0d81b2240547872efd47aa77a