[simeon] finishing picture library scenarios and merging in master