Settings: Menu button location and menu force show (2/2)

Change-Id: I126f93d8cebe59ba6f756f0778950035a408eee1