Merge "Add layout for OnLive controller with USB adapter"