Adjust padding for controlbar in portrait mode am: d9ad24f827
am: d772bae6ee

Change-Id: I002b5f266c984b62b4ccbe79ffaef689715a2ca1