Merge "Add Flexbox demo to the DALI demo launcher" into devel/master