Revert "Adjust headers position"

This reverts commit 7d9fecabf832884b625039afe53c7f823740cffb.
Revert "ROMControl: Customizable Softkeys"

This reverts commit 661b2af2a55e6d3f16d0571e880caceb53c496e3.

Change-Id: I01cc658f4430e41ae711ee9bfa07dc9080c7dc44