am 93157d47: Merge "Add support for grid lines overlay." into gb-ub-photos-denali

* commit '93157d47817a833e88d2edbd5e727973cc6ea51a':
  Add support for grid lines overlay.