haida: move common props

Signed-off-by: Michael Bestas <mikeioannina@gmail.com>

Change-Id: Iff7569aec404825516459e06c03e839dbdb24e45