CAL-98 set max-height property of the settings popup
Merge remote-tracking branch 'origin/feature/relooking' into feature/relooking