am ace5f7f8: Merge "Fix edge case in supported video quality selection." into gb-ub-photos-denali

* commit 'ace5f7f81899341d16bfea70c9bd4ec4b6ca2e56':
  Fix edge case in supported video quality selection.