am cf404d02: Merge "Fix mode list layout issue after initial aspect ratio selection" into ub-camera-everglades

* commit 'cf404d02a998629bda92a05dfb2bcb9c800e693a':
  Fix mode list layout issue after initial aspect ratio selection