am 5d2227a7: Merge "Add a triangle to the popup button view" into gb-ub-photos-arches

* commit '5d2227a793b51f44f664a739cc7e931c40ba4970':
  Add a triangle to the popup button view